diff --git a/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg b/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg
index 6c68146..c38c151 100644
--- a/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg
+++ b/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 DATA 4, MX6_MMDC_P0_MDPDC, 0x00020036
diff --git a/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg b/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg
index 1096f77..f81d491 100644
--- a/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg
+++ b/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 DATA 4, MX6_MMDC_P0_MDPDC, 0x00020036
diff --git a/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg b/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg
index e005a64..cb04832 100644
--- a/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg
+++ b/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D
diff --git a/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg b/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg
index 581d44c..d85466f 100644
--- a/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg
+++ b/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D
diff --git a/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg b/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg
index 1069342..417af64 100644
--- a/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg
+++ b/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D
diff --git a/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg b/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg
index 7c7a3d1..6f75ea2 100644
--- a/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg
+++ b/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D
diff --git a/board/boundary/nitrogen6x/Makefile b/board/boundary/nitrogen6x/Makefile
index f875d68..c8433bd 100644
--- a/board/boundary/nitrogen6x/Makefile
+++ b/board/boundary/nitrogen6x/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2012-2013, Guennadi Liakhovetski <lg@denx.de>
 # (C) Copyright 2012-2013 Freescale Semiconductor, Inc.
 # Copyright (C) 2013, Boundary Devices <info@boundarydevices.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj-y  := nitrogen6x.o
diff --git a/board/boundary/nitrogen6x/clocks.cfg b/board/boundary/nitrogen6x/clocks.cfg
index 8bddb91..d78e0fd 100644
--- a/board/boundary/nitrogen6x/clocks.cfg
+++ b/board/boundary/nitrogen6x/clocks.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Device Configuration Data (DCD)
  *
  * Each entry must have the format:
diff --git a/board/boundary/nitrogen6x/ddr-setup.cfg b/board/boundary/nitrogen6x/ddr-setup.cfg
index 2748d40..99b449c 100644
--- a/board/boundary/nitrogen6x/ddr-setup.cfg
+++ b/board/boundary/nitrogen6x/ddr-setup.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Device Configuration Data (DCD)
  *
  * Each entry must have the format:
diff --git a/board/boundary/nitrogen6x/nitrogen6dl.cfg b/board/boundary/nitrogen6x/nitrogen6dl.cfg
index 5c3e961..b1e3c0f 100644
--- a/board/boundary/nitrogen6x/nitrogen6dl.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6dl.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
diff --git a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg
index fe19ed0..3e7d605 100644
--- a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
diff --git a/board/boundary/nitrogen6x/nitrogen6q.cfg b/board/boundary/nitrogen6x/nitrogen6q.cfg
index 60e1885..26bb645 100644
--- a/board/boundary/nitrogen6x/nitrogen6q.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6q.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
diff --git a/board/boundary/nitrogen6x/nitrogen6q2g.cfg b/board/boundary/nitrogen6x/nitrogen6q2g.cfg
index 7a3ee94..5ff3eed 100644
--- a/board/boundary/nitrogen6x/nitrogen6q2g.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6q2g.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
diff --git a/board/boundary/nitrogen6x/nitrogen6s.cfg b/board/boundary/nitrogen6x/nitrogen6s.cfg
index 2540b7b..5482656 100644
--- a/board/boundary/nitrogen6x/nitrogen6s.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6s.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
diff --git a/board/boundary/nitrogen6x/nitrogen6s1g.cfg b/board/boundary/nitrogen6x/nitrogen6s1g.cfg
index 946af7b..dd30ca9 100644
--- a/board/boundary/nitrogen6x/nitrogen6s1g.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6s1g.cfg
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Boundary Devices
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 3b92b64..84d7cee 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2010-2013 Freescale Semiconductor, Inc.
  * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>